window tracker: Adapt to renamed function

Ideally, the use case we have for MetaGroup would be removed but that
requires investigation that could be done as a future step

The function also expects a MetaWindowX11, so add a check to ensure
we don't crash at runtime if the function gets called on a wayland
client

Also removes an unused header import

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3157>

diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c
index aaaabd9892633798e1ddf4282609930f53896f0b..ad40040d9c72833484be57493acb0487dc99c9ed 100644 (file)
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@@ -10,7 +10,6 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <meta/display.h>
-#include <meta/group.h>
 #include <meta/window.h>
 
 #include "shell-app-usage.h"

diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 6a7240e47438fe3e844005d7ab281786b25392b5..2e3e2dae5d8e68b0b8199d28dc89d2e3948d4375 100644 (file)
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -313,7 +313,7 @@ get_app_from_window_group (ShellWindowTracker  *tracker,
   MetaGroup *group;
   GSList *iter;
 
-  group = meta_window_get_group (window);
+  group = meta_window_x11_get_group (window);
   if (group == NULL)
     return NULL;
 
@@ -463,7 +463,7 @@ get_app_for_window (ShellWindowTracker    *tracker,
   /* If we didn't get a startup-notification match, see if we matched
    * any other windows in the group.
    */
-  if (result == NULL)
+  if (result == NULL && meta_window_get_client_type (window) == META_WINDOW_CLIENT_TYPE_X11)
     result = get_app_from_window_group (tracker, window);
 
   /* Our last resort - we create a fake app from the window */